Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mraid v2 #322

Merged
merged 36 commits into from
Jan 11, 2024
Merged

mraid v2 #322

merged 36 commits into from
Jan 11, 2024

Conversation

vapopa
Copy link
Contributor

@vapopa vapopa commented Jan 4, 2024

No description provided.

Valeriu Popa added 30 commits July 31, 2023 11:47
* main:
  code format
  update banner api value type -> array
* mraid/mraid-v2:
  set ad position
  version bump 5.0.2

# Conflicts:
#	CriteoPublisherSdk/Sources/MRAID/CRMRAIDHandler.swift
#	CriteoPublisherSdk/Sources/Standalone/CRBannerView.m
* mraid/mraid-v2:
  set ad position
  set supported features
  send supported features to mraid bridge
  version bump 5.0.2

# Conflicts:
#	CriteoPublisherSdk/Sources/MRAID/CRMRAIDHandler.swift
#	CriteoPublisherSdk/Sources/Standalone/CRBannerView.m
* mraid/mraid-v2:
  set ad position
  set supported features
  send supported features to mraid bridge
  js interaction
  code clean up
  set screen size on ad loading & orientation change

# Conflicts:
#	CriteoPublisherSdk/Sources/MRAID/CRMRAIDHandler.swift
* main: (21 commits)
  SKAdNetwork 2.1 updates (#313)
  updated register call in banner custom event
  updated api handler tests
  updated adapter tests
  code format
  update adapter tests
  updated google adapter
  updated register method: storeId is now required for registration
  version bump & changelog update
  code formatting
  return a new instance of GDPR whenever it is needed.
  version bump & changelog update
  updated interstitial tests
  code formatted
  updated tests
  set default value for testing to avoid breaking existing tests
  updated config tests
  typo
  disabled failing tests
  disabled prefetch on sdk initialisation, set default value to live bidding to true. both values are updated by the remote config refresh action.
  ...

# Conflicts:
#	CriteoPublisherSdk/CriteoPublisherSdk.xcodeproj/project.pbxproj
#	CriteoPublisherSdk/Sources/Configuration/CR_Config.m
#	CriteoPublisherSdk/Sources/MRAID/CRMRAIDHandler.swift
#	CriteoPublisherSdk/Sources/MRAID/MessageHandlers/MRAIDMessaheHandler.swift
#	CriteoPublisherSdk/Sources/Public/CRInterstitial.h
#	CriteoPublisherSdk/Sources/Standalone/CRBannerView.m
#	CriteoPublisherSdk/Sources/Standalone/CRInterstitial.m
#	CriteoPublisherSdk/Tests/UnitTests/Network/CR_ApiHandlerTests.m
#	Podfile.lock
* main:
  banner tests update
  updated test plans
  added separate actions
  split test suite in 3 plans and run them in different actions
  privacy configuration (#319)

# Conflicts:
#	CriteoPublisherSdk/CriteoPublisherSdk.xcodeproj/project.pbxproj
#	CriteoPublisherSdk/Sources/MRAID/MessageHandlers/MRAIDMessaheHandler.swift
removed debug code
refactored api field in bid request
@vapopa vapopa requested a review from a team as a code owner January 4, 2024 08:45
@leonardlabat leonardlabat merged commit 8185050 into main Jan 11, 2024
2 of 3 checks passed
@leonardlabat leonardlabat deleted the mraid/v2 branch January 11, 2024 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants